Merge from gnulib.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 16:20:36 +0000 (09:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 16:20:36 +0000 (09:20 -0700)

Trivial merge